[XEND/XM] Improve error reporting in 'xm restore'.

From: Mats Petersson <Mats.Petersson@amd.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index f507104db2fa9a7edac2df5cc33a4f74d6a9ec05..4d082a5ac963e407e4942d8d2195fe8ada9af6bf 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -1088,6 +1088,9 @@ class XendDomain:
 
         try:
             return XendCheckpoint.restore(self, fd, paused=paused)
+        except XendError, e:
+            log.exception("Restore failed")
+            raise
         except:
             # I don't really want to log this exception here, but the error
             # handling in the relocation-socket handling code (relocate.py) is

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 09c2750c580d76222e0e153f7fbb3cd8c09334e6..bc27b6f9cde96d56eb0febb85ab5d951b72d000b 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -732,10 +732,13 @@ def xm_restore(args):
         err("xm restore: Unable to read file %s" % savefile)
         sys.exit(1)
 
-    if serverType == SERVER_XEN_API:
-        server.xenapi.VM.restore(savefile, paused)
-    else:
-        server.xend.domain.restore(savefile, paused)
+    try:
+        if serverType == SERVER_XEN_API:
+            server.xenapi.VM.restore(savefile, paused)
+        else:
+            server.xend.domain.restore(savefile, paused)
+    except Exception, ex:
+        err("%s" % ex.faultString)
 
 
 def datetime_to_secs(v):